* startup.el (fancy-splash-screens): Don't switch to the scratch

	buffer; it may not be the next buffer.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8b42d9fd836b0cb489be8b8bb1f4b9e998a4d74a..926318a4f564ba51420d5be2079c270ea608c014 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-16  Chong Yidong  <cyd@stupidchicken.com>
+
+       * startup.el (fancy-splash-screens): Don't switch to the scratch
+       buffer; it may not be the next buffer.
+
 2006-09-16  Romain Francoise  <romain@orebokech.com>
 
        * saveplace.el (load-save-place-alist-from-file): Use expanded name

diff --git a/lisp/startup.el b/lisp/startup.el
index c3d0fc1a76579474bac51092d17d5c10938014f3..8ac1cef5237e85b6c39eecdc7eb81269b923dd49 100644 (file)
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1383,11 +1383,7 @@ mouse."
              (setq display-hourglass old-hourglass
                    minor-mode-map-alist old-minor-mode-map-alist
                    emulation-mode-map-alists old-emulation-mode-map-alists)
-             (use-local-map nil)
-             (switch-to-buffer "*scratch*")
-;;;  Comment out the next line in order to see the splash buffer exactly as it was.
-             (kill-buffer splash-buffer)
-             ))))
+             (kill-buffer splash-buffer)))))
     ;; If hide-on-input is nil, don't hide the buffer on input.
     (if (or (window-minibuffer-p)
            (window-dedicated-p (selected-window)))